From 7792e9633431ab918aee0a33483b6b16bce4069d Mon Sep 17 00:00:00 2001
From: Joe Carstairs <me@joeac.net>
Date: Sat, 25 Apr 2026 11:34:41 +0100
Subject: factor out renderGemtextToHtml()

---
 website/src/pages/blog/[...slug].astro | 52 ++--------------------------------
 1 file changed, 2 insertions(+), 50 deletions(-)

(limited to 'website/src/pages/blog/[...slug].astro')

diff --git a/website/src/pages/blog/[...slug].astro b/website/src/pages/blog/[...slug].astro
index c362dfc..54cf9ac 100644
--- a/website/src/pages/blog/[...slug].astro
+++ b/website/src/pages/blog/[...slug].astro
@@ -1,7 +1,7 @@
 ---
 import { type CollectionEntry, getCollection, render } from 'astro:content';
 import BlogPost from '../../layouts/BlogPost.astro';
-import  * as Gemtext from 'gemtext';
+import { renderGemtextToHtml } from '../../renderGemtextToHtml';
 
 export async function getStaticPaths() {
 	const posts = await getCollection('blog');
@@ -12,57 +12,9 @@ export async function getStaticPaths() {
 }
 type Props = CollectionEntry<'blog'>;
 
-function htmlEscape(str: string) {
-    return str.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
-}
-
-const GemtextHTMLRenderer: Gemtext.Renderer<string> = {
-  preamble: function (): string {
-  return '';
-  },
-  postamble: function (): string {
-  return '';
-  },
-  text: function (content: string): string {
-    content = content.trim();
-    if (content === '') {
-      return '';
-    }
-    return `<p>${htmlEscape(content)}</p>`
-  },
-  link: function (url: string, alt: string): string {
-    const imgExtensions: (string | undefined)[] = ['webp', 'png', 'svg', 'gif', 'jpg', 'jpeg', 'apng']
-    if (imgExtensions.includes(url.split('.').at(-1)?.toLowerCase())) {
-      return `<img src="${url}" alt="${alt}" />`;
-    }
-    return `<p>=> <a href="${url}">${alt}</a></p>`;
-  },
-  preformatted: function (content: string[], alt: string): string {
-    return `<pre alt="${alt}">${htmlEscape(content.join('\n'))}</pre>`
-  },
-  heading: function (level: number, text: string): string {
-    return `<h${level}>${htmlEscape(text)}</h${level}>`;
-  },
-  unorderedList: function (content: string[]): string {
-    return `<ul>${content.map(li=>`<li>${htmlEscape(li)}</li>`).join('')}</ul>`;
-  },
-  quote: function (content: string): string {
-    return `<blockquote>${htmlEscape(content)}</blockquote>`;
-  }
-};
-
-function postProcessGemtextToHtml(html: string): string {
-  html = mergeAdjacentBlockquotes(html);
-  return html;
-}
-
-function mergeAdjacentBlockquotes(html: string): string {
-  return html.replaceAll(/\<\/blockquote\>\<blockquote\>/gm, '<br>');
-}
-
 const post = Astro.props;
 const Content = post.filePath?.endsWith('.gmi')
-  ? postProcessGemtextToHtml(Gemtext.parse((post.body ?? '').replace(`# ${post.data.title}`, '')).generate(GemtextHTMLRenderer))
+  ? renderGemtextToHtml(post.body ?? '', post.data.title)
   : (await render(post)).Content;
 ---
 
-- 
cgit v1.2.3